From: Florian Müllner <fmuellner@gnome.org>
Date: Fri, 3 Feb 2017 14:57:38 +0000 (+0100)
Subject: st-theme-node: Fix lookup of time values
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~572
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=e6e786a19c2e1b8183be20358c5b1bd34ff7dc82;p=gnome-shell.git

st-theme-node: Fix lookup of time values

We have a time when the content type is seconds *or* milliseconds,
not seconds *and* milliseconds. Whoops ...

https://bugzilla.gnome.org/show_bug.cgi?id=778145
---

diff --git a/src/st/st-theme-node.c b/src/st/st-theme-node.c
index 5582c7589..6608efb9d 100644
--- a/src/st/st-theme-node.c
+++ b/src/st/st-theme-node.c
@@ -857,7 +857,7 @@ st_theme_node_lookup_time (StThemeNode *node,
           if (term->type != TERM_NUMBER)
             continue;
 
-          if (term->content.num->type != NUM_TIME_S ||
+          if (term->content.num->type != NUM_TIME_S &&
               term->content.num->type != NUM_TIME_MS)
             continue;